From 4ce68a9d48e056692bf7f7f474af9b9edc5120ac Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 11 Feb 2009 10:41:45 +0000 Subject: [PATCH] x86_64: Ensure enough space for allocator bitmap after relocated Xen image. Signed-off-by: Keir Fraser --- xen/arch/x86/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6fbe1e4e4a..996b52828a 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -642,7 +642,8 @@ void __init __start_xen(unsigned long mbi_p) s >> PAGE_SHIFT, (e-s) >> PAGE_SHIFT, PAGE_HYPERVISOR); #if defined(CONFIG_X86_64) -#define reloc_size ((__pa(&_end) + mask) & ~mask) +/* Relocate Xen image, allocation bitmap, and one page of padding. */ +#define reloc_size ((__pa(&_end) + max_page/8 + PAGE_SIZE + mask) & ~mask) /* Is the region suitable for relocating Xen? */ if ( !xen_phys_start && ((e-s) >= reloc_size) ) { -- 2.30.2